From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 15 Oct 2014 13:16:10 +0000 (+0300)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3423^2~735^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=b8ec977659df3970a6c8afb7a5b79c9b61e08307;p=emacs.git

Merge from trunk.
---

b8ec977659df3970a6c8afb7a5b79c9b61e08307